Repository navigation
fix(dict): never blacklist main dictionary words when removing a suggestion (#861) - #868
Merged
Merged
Conversation
…estion (#861) Blacklist matching ignores case, but removeWord only checked the lowercase form against the main dictionary, so removing "I'm" blacklisted "i'm". Check all case variants and decide once across dictionary groups, so a word of one language is not blacklisted through another language's group.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #861.
Problem
Removing a suggestion blacklists the word unless it is in the main dictionary. That check only used the lowercase form, while blacklist matching ignores case. Removing "I'm" checked "i'm" (not in the dictionary, which stores "I'm"), so "I'm" was blocked permanently. The same applies to "I" and proper nouns.
With several languages enabled, the check ran per dictionary group, so a word of one language was blacklisted through another language's group, and
isBlacklistedblocks it everywhere.Fix
DictionaryGroup.isMainDictWord()checks the original, lowercase, capitalized and uppercase forms.DictionaryFacilitatorImpl.removeWorddecides once across all groups and passes the result to each group.Words that are already blacklisted stay blocked; users remove them once in Settings > Blocked words.
Verification
DictionaryGroupTest.testRemoveWord_DoesNotBlacklistCapitalizedMainDictWord./gradlew :app:testStandardDebugUnitTest --tests "helium314.keyboard.latin.DictionaryGroupTest"passes